test.sh: Kill stray ostree-trivial-httpd processes

diff --git a/debian/changelog b/debian/changelog
index d01005313696a5c2b4b0583c5d3fface6ed36095..89293715400bdb1343538333ad8caf018d77b5eb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ ostree (2017.12-2) UNRELEASED; urgency=medium
   * d/p/2017.13/tests-Add-test-pull-bareuseronly.patch:
     Add more test coverage from upstream
     - d/rules: Make the new test executable
+  * d/test.sh: Clean up ostree-trivial-httpd processes
 
  -- Simon McVittie <smcv@debian.org>  Mon, 16 Oct 2017 10:13:54 +0100
 

diff --git a/debian/test.sh b/debian/test.sh
index eadeda4ef35bd0cd772ff2f8daa1db1c0143fc11..b46c538cb3ec9d23aa3bd4e7dbbc87984684cb1a 100755 (executable)
--- a/debian/test.sh
+++ b/debian/test.sh
@@ -28,10 +28,12 @@ if [ "$failed" -gt 0 ]; then
 fi
 
 pkill --full "gpg-agent --homedir /var/tmp/tap-test\\.[^/]+/.*" || :
+pkill --full '\.libs/ostree-trivial-httpd' || :
 
-if pgrep lt-ostree || pgrep --full "gpg-agent --homedir /var/tmp/tap-test."; then \
+if pgrep lt-ostree || pgrep --full '\.libs/ostree-trivial-httpd' || pgrep --full "gpg-agent --homedir /var/tmp/tap-test."; then \
     echo "WARNING: daemon processes were leaked"
     pgrep gpg-agent | xargs --no-run-if-empty ps ww
+    pgrep --full '\.libs/ostree-trivial-httpd' | xargs --no-run-if-empty ps ww
     pgrep lt-ostree | xargs --no-run-if-empty ps ww
 fi